-
Notifications
You must be signed in to change notification settings - Fork 74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Simplified scripts for copying to jb-main #1407
Simplified scripts for copying to jb-main #1407
Conversation
scripts/snap/impl/snapToJbMain.sh
Outdated
set -e | ||
|
||
if [ -z "$1" ]; then | ||
echo "Specify the snapping subfolder. For example: ./snapToJbMain.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Description for args is not clear. What is branch? Out? In? Is it possible to specify hash? What is folder? What should be current git branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be used explicitly. Added a comment to look the parent scripts/readme
scripts/snap/impl/snapToJbMain.sh
Outdated
|
||
|
||
TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main | ||
git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't work for my case: remote can have not "origin" name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed. local branches should be up-to-date to this point anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
local branches should be up-to-date to this point anyway.
Actually, I am wrong, all work can be done in "integration" without updating "jb-main".
Fixed reading the associated remote.
Co-authored-by: Ivan Matkov <[email protected]>
Co-authored-by: Ivan Matkov <[email protected]>
Co-authored-by: Ivan Matkov <[email protected]>
Co-authored-by: Ivan Matkov <[email protected]>
Co-authored-by: Ivan Matkov <[email protected]>
Let's not merge it, as we are discussing to not use "snaps" anymore. |
These scripts still simplify process. I changed them for "copying" approach |
Co-authored-by: Ivan Matkov <[email protected]>
Now we need only to switch to the commit, and call a needed script. It creates 2 branches, which can be tested on CI, and merged with simple git merge.
Branches: